Filter by merchant, style tweaks