Feature/robin queries fixies