UPDATED filtering on get all.