Fixed selectors
Merge branch 'develop'