[Geocat] Better transitions between search forms