Merge conflict and click layer fix: objects return data when rain layer ...

...is on