Completed some reorganisation and geo search and hiding fields not in
use