BUG-FIX More listen to collection, clear console.log, updated regex