Improved architecture - Electric, Water and Refuse tips moved to
FullSelection.#