Update some queries, remove orphaned map advice.