more bug fix and handdled special conditions

git-svn-id: https://plugins.svn.wordpress.org/custom-taxonomy-filter/trunk@1038984 b8457f37-d9ea-0310-8a92-e5e31aec5664