Use more descriptive title, and fix source query