More tweaks to search - these might be a bit buggy.