Edited for blanks query filer and orderby