fix #1; improving search