Misc fixes - drag/drop, skip match for user synonyms