rework searching to fit better in theme