More powerful and pretty looking search (closes #31)