focus bugs fixed. now to fix it for relations as well