Improvements to Mascot search