.htaccess bug fixed/rewrite to make more sense