Fixed-ish the htaccess catchall