Patched Contains query & implemented SortExpression