Add conditional show/hide of address/phone/email.
Remove draw remove command. Remove drawing layers (use only for search).