Big fixes/deletions on servers regexp