Tabu List improvement

Tabu List is now more robust