Add serialised data to entitySearch options
Form tweaks