categorised search
clean up of dash code
resolving conflicts