Fix title sets - it was being called on the builder when it was below the query
Merge branch 'refs/heads/2.3/develop' into 3.0/develop