Expander: query subparts with this.query

so we looking locally, not globally
tiny whitespace cleanup
Added dropdown