WIP: Keep category selection on marker selection. 

#217