SpecialWatchlist: Minor cleanup

* Prettier whitespacing
* Removed query building special-case already handled by makeList()

Change-Id: I45aa7bbbff1e21abd739825939fd5cd3d02fc7a4
Merge "SpecialWatchlist: Minor cleanup"