1. Code cleanup

2. Removal of useless domains
3. Improved pagination scheme query time
4. Corrected rendering of add/remove to watchlist