Euca 7809

Much improved search performance. Avoided a very heavy weight function call that was being called all the time!