#179 resolved. Added query criteria.