5.4.2 x query

Finished 5.4.2. Let me know if you see any improvements. Merge otherwise.