Fixes more gplus selectors
Final improvements for gplus selectors