added rsql filter and adjusted query object