Removed some commented lines
COMPOSE: Added toggle, improved search