ContentRepository handle filter and order by criteria fix