Resolved the issue with the filter positioning and query improvements

Fixed in this release