misc changes trying to fix have selector issue