Better spot instance detection

This will also terminate instances not tagged properly