Remove conflict between Gallery and Map view features