updated Facebook queries
fixed merge conflicts