Fixed issues with sites controller