Fixed thing selection bugs