Simplified a bit of code
Simplified faction URL handling
Implemented the general inSet filter