Fix ranking queries (FILTER to 2013)
Merge branch 'enhancement-#135' into develop