Fix/find non javascript scenario