Fixup server script errors

- No script files
- Passing down the change for non-server list
- Filtering of server list