Bug fix + FSQ and Qype