Use same expander button for search & results view
Fix facet collapse animation