changes to custom search
changes to how zones are handled
changes to update function