Test app + new features + remove dups in query