maltes
committed
on 26 Jul 05
Added filter clause, changed ordering