Refactored host square expansion for click, still misbehaving