Updated to fix SIM card forms etc and also updated queries for more precision