fixed issues in Sever Module to deal with Parser -> Option