Expand search capability and fix bugs