reverted search bugfix (9a5fcd4c) - needs php 5.3