working on filter rebuild, paginate and query optimizing
mark