fixes for with/without labels switching

git-svn-id: https://plugins.svn.wordpress.org/simplest-gallery/trunk@964465 b8457f37-d9ea-0310-8a92-e5e31aec5664